Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(kuma-cp): avoid concurrent access on resource meta (backport of #11997) #12021

Merged
merged 2 commits into from
Nov 13, 2024
Merged

fix(kuma-cp): avoid concurrent access on resource meta (backport of #11997) #12021

merged 2 commits into from
Nov 13, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Nov 12, 2024

Automatic cherry-pick of #11997 for branch release-2.6

Generated by action

cherry-picked commit c3d7187
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.6
Your branch is up to date with 'origin/release-2.6'.

You are currently cherry-picking commit c3d7187c7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/kds/util/meta.go
	modified:   pkg/plugins/resources/memory/store.go
	modified:   pkg/plugins/resources/remote/store.go
	modified:   pkg/plugins/secrets/k8s/store.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/kds/util/resource.go

@lahabana @michaelbeaumont @kumahq
fix(kuma-cp): avoid concurrent access on resource meta (#11997)
6730c4f 
There were some places where labels on meta weren't not cloned when
duplicating the meta. Walked the code for odd usages of `GetLabels()`.

See also #11886

Signed-off-by: Charly Molter <[email protected]>
Signed-off-by: Mike Beaumont <[email protected]>
Co-authored-by: Mike Beaumont <[email protected]>
@kumahq kumahq bot requested a review from a team as a code owner November 12, 2024 11:39
@kumahq kumahq bot requested review from michaelbeaumont and lobkovilya and removed request for a team November 12, 2024 11:39
@michaelbeaumont
fix: conflict
ba440d5 
Signed-off-by: Mike Beaumont <[email protected]>
@michaelbeaumont michaelbeaumont merged commit 1dcf203 into release-2.6 Nov 13, 2024
12 checks passed
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.6-11997 branch November 13, 2024 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelbeaumont michaelbeaumont michaelbeaumont approved these changes

@lobkovilya lobkovilya Awaiting requested review from lobkovilya lobkovilya is a code owner automatically assigned from kumahq/kuma-maintainers

Assignees
No one assigned
Labels
conflict release-2.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@michaelbeaumont @lahabana